Fix @# Bug, unittest improved