Refactoring
Check if right methods are called
Merge branch 'master' of github.com:szalansky/cheddar_kit