added more tests! and regex search!