fixes for tests

- added few lines for tests to run with ruby 2
- updated tests to work with new modeltypes table