Added tests

- Added tests