Refactor testing to separate tests. AP-175