Rewrote the simplest solver test