On the other hand, this works and has been tested. I still don't have client tests working. Merging as is. Will fix this in the near future.