updating to load from alternate hashes
adding fixtures