update e2e test with the correct number. some general cleanup