change tests to be suitable for emma