#28: Removed old implementation and fixed the new one. Also added a test
for the new method