Removed spec dependency to focus on simpler tests