Moved versionable check, and added testcase