New test and logging added