Deleted stuff when moved to src and testcore