Added code for all passing tests