More generic support, including ability to parse static strings
Adding tests