Clean test data
Changed ordering of methods
Added todos regarding checks
IsEmpty check by default