final commit

Added tests.