Removed annoying prints, added some assertions