Added testing for remaining models