Introduced new tests and functionality improvements