Corrects build, first test works