cleanup of integration tests
-TODO: add missing integration test & fix capabilities
cleanup
merged with ronkyo 4.29.2014