Improved build, updates to test