Added tests for non-required functionality