Marked unifinished tests as incomplete via PHPUnit's API.
Hopefully this promotes finishing unfinished unit tests.
Re-structured unit tests to match code folder.