comment out tests to compile, reorganize