added some tests and windows functionality