Added tests.
Merged with dist folder.