remove debug
fix unit tests