Various changes

Added tests and a main.bas