added tests for suggestion and fixes
performance optimization