updated to working configuration / added tests