[test] new testing structure
[minor] Working on tests
[minor] Cleaning up more code