Separate fact declarations and fix rspec