remove default test class
implement app storage mechanism