Trying to set up testypie for testing.
Fixed conflicts.