added tests to new fallback solution