Finished stubbing out tests for the added features.