52 tests all working, move to e2e tests