Fixed failing tests and added two more