some fixed tests
a bit restructuring
a bit restructuring