Added unit and load tests