Order tests by importance, add two manual tests