bigger test
refoctor: move code to the more appropriate place