fixing more template errors and test values