Junit4 conventions

3 separated commits to stick to junit4 usage and naming conventions