Add tests for new functionality (once and off)