Adds tests from Pollice. Fixes broken tests.