remaining swap test snippets added
test_generate renamed to test_definitions, file test moved to the bottom