Move test section to main buildout