Added weather tests and minor bugfixes