Modify tests to prepare for delite/css