#29,#35 Fixed tests and build failures