Added tests for all