Fix building and rename test class.