Tidy up of basic test