Start reworking tests for new class division.
rm redundant file
rm redundant test.
Organize static and dynamic properties and methods.