Adding tests to cover the implementation