Fixed up Unit Tests