Cleaned up the Test and Model