Better class-based structure for "extensible" storage tests
Fixed class-based test cases
Added comments for nicer test runs :)