Add tests from previously fixed bug reports in bugzilla
Merge fix for Bug #24 from upstream