Remove some test changes, Use drawable swap function