Added several test