Added tests
Remove unneeded