add StaticHeuristic
add a test suite for SingletonVar