Fleshed out more test reqs