#51 Fix tests