Revamped tests for comments