Add ability to add more OS's and add spec tests