some tests and additional stuff added