Remove some test changes, Use drawable swap function
Merge pull request #468 from LoungeKatt/master

Remove some test changes, Use drawable swap function