Implemented previously postponed tests