Get tests up and running
Fix some wording