Made desktop compatible again
Started with RSpec tests