Removed unsed classes
Small refactoring of test app