Added basic test. Seems to pass, so more work needed to reproduce issue