Added simple tests
minor cleanups