updated tests and build