Fix tests & clean up