Final tidying and addition of tests prior to first public issue