Feature/edge case tests

Adds edge test cases