added back some tests
Merge remote-tracking branch 'original/Master'