New test functionality, pending review of no Test and defaults