Beta3 - Third auto test

shortened some functions