Fixed some files, ant testing envoirenment