Change default availability and some unit testing