Finished moving from custom test lib to nanotest