Changed custom effects & drawer to factory mode, add unit test cases.