Tests Fixed