More work on test