Reorganization of test classes, added gradle.build file
Deleted old test class