Add simple test
Small convention fixes