Added tests for methods I pulled out into module earlier