Rename, fix build, add test program