Initial pass at making tests work