Split out test classes
Fix doc
Split up