Added test files from bugs #11 and #12