Cleanup + using junit for verify