Really added tests this time