modified the tests to use the Main class a singleton
fixed some typos raising fatal errors (cmon...)