Removing tests, will re-add better ones