added tests and removed unused key
windows fix