Fixed and/or re-enabled some tests