Removed key and added tests