Changes as per PR comments, moved one spec folder for consistency