Added new tests and removed main