Initial commit
Improved test function