remove garbage
move and fix tests file