Splitting methods up for testing