additional test files removed
little refactoring