, -> ; and fix broken test Closes #199