#10 fixed bug and added a quick test for a new method introduced