More clever builds and tests (?)