Moved the tests to a better package
Fixed cardTests
Fixed modelTest