Updates to tests. Testing continues in another repository from now on