Testing (fixes #35)