Tests results moved inside, more work on tests