Fix test statements without spaces
Add space in function def in gluer