Max&Rich: space after comma :( and added device tests to make all