add more tests
remove main class