Working on test cased and scheme working ...