added several more tests
fixed merge conflicts
adding styling