Fixed and re-enabled failing test