Added tests for everything