added tests and models and junk