Code and Fix tests