Don't think final test is required any longer