Remove unnecessary files and get tests working