removing interfaces classes, cleaning up tests
fix from changes