Adding build and test support