Whitespace
Remove circular requires
Refactor tests