Refactored tests due to conflict between specs2 and pickling