#123 Fix tests