Playing with tests, removing redundant files.