Added first contract test
cleanign up