Moved tests to more appropriate test class.