Remove baggage dependency, switch to junit4