Build and updated unit tests