fixes tests and closes #3