Updated version for new development
Fixed some testing bugs
Merged in some fixes to firewall tests