Adding junit4 support