removed typename
added some tests