Added xmonad to test. Changed to new types