cleaned up InsertScan and added tests
Merge pull request #47 from timbokopter/feature/cleanup_InsertScan

cleaned up InsertScan and added tests