Working Rack tests (@kenoir can you sanity check these changes please)
Merge conflict resolution