remove & Rewrite Unit tests