And more tests implemented