Removing binaries - adding some tests and fixing a bit