Get tests and build working