Improved buildout. Deleted unused tests file.