Updated: bin/test to use new specs file organization.
Touchups/refactor: bin/test
Updated: various test files to handle new model renaming + spec file organization.