Another Egit test
and minor cleanup ^^