[WIP] Begin adding tests and flushing out the test interface