Revamp test and add postfix solver