Remove skipped test (or fix them)
Clean code to remove skip test