added more tests
added more tests
remove loading step