added tests (failing - need ur help @smn)