5/2/14: fixed some test classes so that they would compile again. though some of their tests fail. stupid necessary re-factoring...