Added several tests