Merge "Move assumptions out of BeforeClass annotated method"