Implement tests for new methods #13 and #14