Stub tests from Test Strategy doc and refactor a bit