Add build mechanism
Update tests