1. change $done to be a pre-defined variable only for factory
2. Add more test data