Changed tests to work inline where possible