Fix tests.
Move to a new class.
Style and glitz.