Fixed tests, removed useless elements