Added test support closes #3