Removed tests that tested removed code. Fixed compilation errors.