Added new mock and test libs