overhaul tests; chai.Should -> chai.expect based tests; reorganization