Test Method fixes