Updated tests to use should be () matcher; added tests for Main