Unit Tests Fixed