Improved Setup/Build/Test

WIP