#83 added a bunch more feature tests