Small fixes and renaming to tests