Fixed a few issues, added dynamic test (which does not work yet)