Updating tests (not complete yet) and license