Added more feature tests