More tests implemented