added some tests with a little help from my friend @cl0sey
fixed conflict