more tests
merged mashup