Additional tests, bug fixes, logic corrections etc..