Add tests for deprecated forms

Fix #68