Make store methods virtual

Also fix merge issue with test base