added tests, made call a bit faster