removed junit
added some debug helpers