Added tests to make tidy