Add build step back into test