Move model tests into their own directory
Small refactor