Added MORE tests