Small fixes; Added build files and tests