Removed unused tests and restructured