Added more thorough tests