Lost some tests before adding them to this repo, re-writing