Tests added

Fixed