more tests and change of model names to be more readable