Forgot one thing in the last review: would be nice with some quick tests for these new methods too