Added several tests - more to come