Bug 935876 part.2 Add new tests r=smaug