improved solver test