Fixed build and (apparently) updated Ninject
Fixed tests