Version 3.3.3 - Bug fixes, more unit tests