Fixed some issues. Added new tests