(finally) added some tests