Fleshed out test suite