Add and Fix tests