Improvements, added data cube tests, almost everything should be covered.