Cleaned up test methods, sycnchronised, transitions and so on.