Added tests (not working)