Updated tests with better code