Started refectoring to finalised test specs