Add more tests and cleanup, take out ws.loose.off