[CHANGE] Fix bugs after tests