Improved comments, reverted test change