Modification first-guess SWAN & Bench mark tests for SWAN