Add support for double-tick tests
Remove test code