Rename/add make targets for tests