Updated version and added test stub