More updates & fixes for test, check that test really run.