Cleaned up Unit Tests