More tests and playing with regex