Updated metadata for better forge compatibility
Update rspec tests for readability