Add cargo test
Cleanup based on @acrichton's feedback
Remove aborted Environment work