Fixed bugs with Brian, refactored tests, ...