Adding further tests