Fixed and re-enabled tests