move everything around so test suite works