Fixes for #239
Fixes for issue  #274
Fixes for some cassandra junit cleanup issues