Added easier testing logic