Refactored tests and cleaned up steals