Improve test cases and delete not needed stuff