added some tests and seperated out configuration