More using cleaner testing syntax