Update build, add tests