Cleanup brackets
Adding tests for name validation