Initial Unit tests and revamped model associations