Initial tests for teacher, basic syntax clean ups