Patching & fixing small bugs
Adding a few tests