remove unnecessary resource & fix unit test