Added & refined tests