Early commit with more fleshed out tests…