Added some tests. Changed interface to use named params
Deleted unrequired libs