Update method to be reused by subclass
Faster tests
Initial commmit