DRYing everything up ^_^
. Generic test case added