Rewritten tests (+ some addition)