Modify build, add more tests