Lots of additions to idle test'