[ref] Test and function clean up
Merge pull request #12 from Kloadut/master

[ref] Test and function clean up