restructed test to make it easy for testing
forced test to pass