Update tests

closes #43