* Moving shared code to fixtures * Resolving test error that arose after rebase * Rebase with master * Use fixtures in additional locations