Tests improvements, preparing for release