More unit tests from Taylor Mckinney