added some test logic