more code outlining, and a test map to test it