Completed several tests