Redesigned/added tests