fixed template testing, changed spinner