Finished test suite and updated code to satisfy tests per CTR-12.