more specific tests, better paramter passing to templates