reverted tests to master, did small refactoring in models
typo
added small comment
added warning