Removes unactual tests, fixes issues