Add tests part I & upgrade dependencies