Add more tests after the handy framework refactory