Merge "Mark test with @Test + comments"