A number of fixes and tests added this week :)