first basic working parts and removed dummy tests