add serializer
enable tests
fix deadlock
fix deadlock