Some fixes to make the lite version of junit to work