Fixed tests
Removed code contracts