Modifications again! Finishing atoum unit tests for main class