added storage methods, adjusted tests