Updated Unit Tests

Updated tests to more closely reflect a production usage