mattdrayer/rebase-20140916: Initial test fixes