fixed tests for models. removed pending tests