Added stronger tests