more tests passing and reorganized test modules