JUnit // 4.04

tests relocation
minor changes