Re-categorized tests and updated build/devenv script on li and origin-dev-tools repos