Updated all tests - simplified, do not depend on other functions in the library