get tests passing, delete extra files