Added some fixes and tests