fixes tests and closes #13