Temporarily disabled the Cassandra Runner for tests- until I understand how it works better.

Also some general tweaks.