Added long awaited test class