Added addtional tests