fix build and tests

fixes #16
fixes #15