restructured model/table associations, cleaned up tables, revised test, all tests passing